Install gtkrc.default from $(srcdir) for when $(builddir) is different.

2002-02-02  Peter Williams  <peterw@ximian.com>

	* gtk/Makefile.am (install-data-local): Install gtkrc.default
	from $(srcdir) for when $(builddir) is different.

diff --git a/ChangeLog b/ChangeLog
index 5c8cb176b7b84a0b67cb81b677f70b39a32ccb0d..99afa47910022ea9fe2dcb297e62f1ab417f4d43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-02  Peter Williams  <peterw@ximian.com>
+
+       * gtk/Makefile.am (install-data-local): Install gtkrc.default
+       from $(srcdir) for when $(builddir) is different.
+
 Sat Feb  2 19:00:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/Makefile.am: remove TESTGTK_RCFILE define

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5c8cb176b7b84a0b67cb81b677f70b39a32ccb0d..99afa47910022ea9fe2dcb297e62f1ab417f4d43 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2002-02-02  Peter Williams  <peterw@ximian.com>
+
+       * gtk/Makefile.am (install-data-local): Install gtkrc.default
+       from $(srcdir) for when $(builddir) is different.
+
 Sat Feb  2 19:00:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/Makefile.am: remove TESTGTK_RCFILE define

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5c8cb176b7b84a0b67cb81b677f70b39a32ccb0d..99afa47910022ea9fe2dcb297e62f1ab417f4d43 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-02-02  Peter Williams  <peterw@ximian.com>
+
+       * gtk/Makefile.am (install-data-local): Install gtkrc.default
+       from $(srcdir) for when $(builddir) is different.
+
 Sat Feb  2 19:00:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/Makefile.am: remove TESTGTK_RCFILE define

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5c8cb176b7b84a0b67cb81b677f70b39a32ccb0d..99afa47910022ea9fe2dcb297e62f1ab417f4d43 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-02-02  Peter Williams  <peterw@ximian.com>
+
+       * gtk/Makefile.am (install-data-local): Install gtkrc.default
+       from $(srcdir) for when $(builddir) is different.
+
 Sat Feb  2 19:00:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/Makefile.am: remove TESTGTK_RCFILE define

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5c8cb176b7b84a0b67cb81b677f70b39a32ccb0d..99afa47910022ea9fe2dcb297e62f1ab417f4d43 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-02-02  Peter Williams  <peterw@ximian.com>
+
+       * gtk/Makefile.am (install-data-local): Install gtkrc.default
+       from $(srcdir) for when $(builddir) is different.
+
 Sat Feb  2 19:00:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/Makefile.am: remove TESTGTK_RCFILE define

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5c8cb176b7b84a0b67cb81b677f70b39a32ccb0d..99afa47910022ea9fe2dcb297e62f1ab417f4d43 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-02-02  Peter Williams  <peterw@ximian.com>
+
+       * gtk/Makefile.am (install-data-local): Install gtkrc.default
+       from $(srcdir) for when $(builddir) is different.
+
 Sat Feb  2 19:00:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/Makefile.am: remove TESTGTK_RCFILE define

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5c8cb176b7b84a0b67cb81b677f70b39a32ccb0d..99afa47910022ea9fe2dcb297e62f1ab417f4d43 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-02-02  Peter Williams  <peterw@ximian.com>
+
+       * gtk/Makefile.am (install-data-local): Install gtkrc.default
+       from $(srcdir) for when $(builddir) is different.
+
 Sat Feb  2 19:00:39 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/Makefile.am: remove TESTGTK_RCFILE define

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c51329eb49d56b5a4e3cab2a923cd2d55e18b072..50e0a421fee50a1406bf6ba2cbea705df5e291e4 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -583,7 +583,7 @@ EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la
 # Install a RC file for the default GTK+ theme
 install-data-local:  install-ms-lib install-libtool-import-lib
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
-       $(INSTALL) gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
+       $(INSTALL) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
        rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc